merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 6 Sep 2011 05:47:55 +0000 (14:47 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 6 Sep 2011 05:47:55 +0000 (14:47 +0900)

Trivial merge